Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove rules_docker in favor of rules_oci (backport #10869) (backport #10906) (backport #11142) #11143

Merged
merged 1 commit into from
May 2, 2024
Merged

Remove rules_docker in favor of rules_oci (backport #10869) (backport #10906) (backport #11142) #11143

merged 1 commit into from
May 2, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 1, 2024

Note that building for other than the native architecture is very slow

This is an automatic backport of pull request #10869 done by Mergify.
This is an automatic backport of pull request #10906 done by Mergify.
This is an automatic backport of pull request #11142 done by Mergify.

@mergify mergify bot added the conflicts label May 1, 2024
@mergify Mergify
Copy link
Author

mergify bot commented May 1, 2024

Cherry-pick of 7e470a8 has failed:

On branch mergify/bp/v3.11.x/pr-11142
Your branch is up to date with 'origin/v3.11.x'.

You are currently cherry-picking commit 7e470a8ddd.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .bazelrc
	modified:   BUILD.bazel
	modified:   MODULE.bazel
	modified:   WORKSPACE
	renamed:    packaging/docker-image/10-default-guest-user.conf -> packaging/docker-image/10-defaults.conf
	new file:   packaging/docker-image/20-management_agent.disable_metrics_collector.conf
	modified:   packaging/docker-image/Dockerfile
	modified:   packaging/docker-image/docker-entrypoint.sh
	deleted:    packaging/docker-image/install_rabbitmq.sh
	deleted:    packaging/docker-image/test_configs/otp_ubuntu.yaml
	modified:   packaging/docker-image/test_configs/rabbitmq_ubuntu.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/oci.yaml
	both modified:   .github/workflows/rabbitmq_peer_discovery_aws.yaml
	both modified:   .github/workflows/test-authnz.yaml
	both modified:   .github/workflows/test-erlang-git.yaml
	both modified:   .github/workflows/test-mixed-versions.yaml
	both modified:   .github/workflows/test-selenium.yaml
	both modified:   .github/workflows/test.yaml
	both modified:   packaging/docker-image/BUILD.bazel

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the bazel label May 1, 2024
@the-mikedavis
Remove rules_docker in favor of rules_oci (backport #10869) (#10906)
cb8d4a9 
* Remove rules_docker in favor of rules_oci (#10869)

Local builds of images are extremely slow, but buildbuddy runners
don't have the emulator available

(cherry picked from commit c9ab302)
(cherry picked from commit 7e470a8)
@HoloRin
Copy link
Contributor

HoloRin commented May 2, 2024

@the-mikedavis remaining failures are bazel 7 related, so #11147 & #11146 have been created

@HoloRin HoloRin merged commit bbabafc into v3.11.x May 2, 2024
14 of 17 checks passed
@HoloRin HoloRin deleted the mergify/bp/v3.11.x/pr-11142 branch May 2, 2024 05:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bazel conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@HoloRin @the-mikedavis